fix: let spm use base class for version #1199
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -766,7 +766,8 @@ class Segment(SPMCommand): | |||
|
|
|||
| """ | |||
|
|
|||
| if Info.version() and Info.version()['name'] == "SPM12": | |||
| _local_version = SPMCommand().version | |||
| if _local_version and _local_version['name'] == "SPM12": | |||
There was a problem hiding this comment.
not
if _local_version and _local_version == "SPM12"
?
* upstream/master: (39 commits) fixed support for different folder structures in dicom importer fix: check if plugin args is None sty: autogenerate fix fix: make changes for release fix: deploy only nipy/nipype master branch fix for identifying if one or multiple durations are employed to describe the condition corrected line of modelgen and added test for variable concatenated events fix test FIX: Joint Fusion multimodal Interface Fix fix parse_inputs for interfaces not defining gradients add FSL bvec/bval format explicit to all interfaces fix doctests add tck2vtk add nohash=True on nthreads option add auto tests, fix doctests fix errors and missing parts add tck2connectome interface add interface for fs_parc_replace_sgm_first fix default file finding ...
chrisgorgo
added a commit
that referenced
this pull request
Sep 9, 2015
fix: let spm use base class for version
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
temporary solution for #1195